js: Fix up for Clutter.Color changes

Spotted by darkxst on IRC.

https://bugzilla.gnome.org/show_bug.cgi?id=683073

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 33f5c86dfe499882717feda2b625ac4affb1e0b2..3173e0d1738a045d290b7efb7757151bd3be1ff7 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -38,7 +38,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                     /* Utility functions...we should probably be able to use these
                      * in the shell core code too. */
                     'const stage = global.stage; ' +
-                    'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
                     /* Special lookingGlass functions */
                     'const it = Main.lookingGlass.getIt(); ' +
                     'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index f4440cd862c9d6017efac4d8db0435dc82c6d00a..514dc0732658c58e48891ebf05b9558a4e2fe4db 100644 (file)
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -303,8 +303,7 @@ const Magnifier = new Lang.Class({
      */
     setCrosshairsColor: function(color) {
         if (this._crossHairs) {
-            let clutterColor = new Clutter.Color();
-            clutterColor.from_string(color);
+            let [res, clutterColor] = Clutter.Color.from_string(color);
             this._crossHairs.setColor(clutterColor);
         }
     },
@@ -1472,9 +1471,7 @@ const Crosshairs = new Lang.Class({
      * @color:  The color as a Clutter.Color.
      */
     getColor: function() {
-        let clutterColor = new Clutter.Color();
-        this._horizLeftHair.get_color(clutterColor);
-        return clutterColor;
+        return this._horizLeftHair.get_color();
     },
 
     /**

diff --git a/js/ui/main.js b/js/ui/main.js
index 73112f33b8c3b0b6a9d4fd29e9d29c6463cd598f..271d979c8922ce38aab453fbbaf643088d2e16c8 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -43,8 +43,7 @@ const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
 const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
-const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
-DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2266bbff);
 
 let automountManager = null;
 let autorunManager = null;